From 8b9693f815d7b5d93b524c3cd56dde816fce69ce Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Tue, 25 Dec 2007 10:01:14 +0000 Subject: [PATCH] Use G_BEGIN_DECLS/G_END_DECLS. Bug #505268. svn path=/trunk/; revision=19238 --- ChangeLog | 4 ++++ modules/other/gail/gail-private-macros.h | 9 ++------- modules/other/gail/gailadjustment.h | 10 ++-------- modules/other/gail/gailarrow.h | 9 ++------- modules/other/gail/gailbooleancell.h | 9 ++------- modules/other/gail/gailbox.h | 9 ++------- modules/other/gail/gailbutton.h | 10 ++-------- modules/other/gail/gailcalendar.h | 9 ++------- modules/other/gail/gailcell.h | 14 ++------------ modules/other/gail/gailcellparent.h | 9 +++------ modules/other/gail/gailcheckmenuitem.h | 9 ++------- modules/other/gail/gailchecksubmenuitem.h | 9 ++------- modules/other/gail/gailclist.h | 9 ++------- modules/other/gail/gailclistcell.h | 9 ++------- modules/other/gail/gailcombo.h | 10 ++-------- modules/other/gail/gailcombobox.h | 10 ++-------- modules/other/gail/gailcontainer.h | 10 ++-------- modules/other/gail/gailcontainercell.h | 10 ++-------- modules/other/gail/gailentry.h | 9 ++------- modules/other/gail/gailexpander.h | 9 ++------- modules/other/gail/gailframe.h | 10 ++-------- modules/other/gail/gailhtmlbox.h | 9 ++------- modules/other/gail/gailimage.h | 9 ++------- modules/other/gail/gailimagecell.h | 9 ++------- modules/other/gail/gailitem.h | 9 ++------- modules/other/gail/gaillabel.h | 9 ++------- modules/other/gail/gaillist.h | 9 ++------- modules/other/gail/gailmenu.h | 10 ++-------- modules/other/gail/gailmenuitem.h | 10 ++-------- modules/other/gail/gailmenushell.h | 10 ++-------- modules/other/gail/gailnotebook.h | 9 ++------- modules/other/gail/gailnotebookpage.h | 10 ++-------- modules/other/gail/gailobject.h | 9 ++------- modules/other/gail/gailoptionmenu.h | 10 ++-------- modules/other/gail/gailpaned.h | 9 ++------- modules/other/gail/gailpixmap.h | 9 ++------- modules/other/gail/gailprogressbar.h | 10 ++-------- modules/other/gail/gailradiobutton.h | 9 ++------- modules/other/gail/gailradiomenuitem.h | 9 ++------- modules/other/gail/gailradiosubmenuitem.h | 9 ++------- modules/other/gail/gailrange.h | 10 ++-------- modules/other/gail/gailrenderercell.h | 9 ++------- modules/other/gail/gailscale.h | 9 ++------- modules/other/gail/gailscrollbar.h | 10 ++-------- modules/other/gail/gailscrolledwindow.h | 9 ++------- modules/other/gail/gailseparator.h | 9 ++------- modules/other/gail/gailspinbutton.h | 9 ++------- modules/other/gail/gailstatusbar.h | 9 ++------- modules/other/gail/gailsubmenuitem.h | 9 ++------- modules/other/gail/gailtextcell.h | 9 ++------- modules/other/gail/gailtextview.h | 9 ++------- modules/other/gail/gailtogglebutton.h | 9 ++------- modules/other/gail/gailtoplevel.h | 8 ++------ modules/other/gail/gailtreeview.h | 9 ++------- modules/other/gail/gailutil.h | 10 ++-------- modules/other/gail/gailwidget.h | 10 ++-------- modules/other/gail/gailwindow.h | 10 ++-------- 57 files changed, 117 insertions(+), 413 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fb8c05da5..00db3500c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-12-22 Christian Persch + + * modules/other/gail/*.h: Use G_BEGIN_DECLS/G_END_DECLS. Bug #505268. + 2007-12-22 Christian Persch * modules/other/gail/*.[ch]: Remove relocations from the atk diff --git a/modules/other/gail/gail-private-macros.h b/modules/other/gail/gail-private-macros.h index bb2022ba78..6e33ff7198 100644 --- a/modules/other/gail/gail-private-macros.h +++ b/modules/other/gail/gail-private-macros.h @@ -21,18 +21,13 @@ #ifndef __GAIL_PRIVATE_MACROS_H__ #define __GAIL_PRIVATE_MACROS_H__ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* Note: these macros are logic macros, not intended to warn on failure. */ #define gail_return_val_if_fail(a, b) if (!(a)) return (b) #define gail_return_if_fail(a) if (!(a)) return -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_PRIVATE_MACROS_H__ */ diff --git a/modules/other/gail/gailadjustment.h b/modules/other/gail/gailadjustment.h index 4a6b38b873..790534dc9f 100644 --- a/modules/other/gail/gailadjustment.h +++ b/modules/other/gail/gailadjustment.h @@ -22,10 +22,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_ADJUSTMENT (gail_adjustment_get_type ()) #define GAIL_ADJUSTMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ADJUSTMENT, GailAdjustment)) @@ -53,9 +50,6 @@ struct _GailAdjustmentClass AtkObject *gail_adjustment_new (GtkAdjustment *adjustment); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_ADJUSTMENT_H__ */ diff --git a/modules/other/gail/gailarrow.h b/modules/other/gail/gailarrow.h index 7d58d78cf6..91f8894bf1 100644 --- a/modules/other/gail/gailarrow.h +++ b/modules/other/gail/gailarrow.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_ARROW (gail_arrow_get_type ()) #define GAIL_ARROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ARROW, GailArrow)) @@ -51,9 +49,6 @@ struct _GailArrowClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_ARROW_H__ */ diff --git a/modules/other/gail/gailbooleancell.h b/modules/other/gail/gailbooleancell.h index cc5dc2d6d7..ac803cfeba 100644 --- a/modules/other/gail/gailbooleancell.h +++ b/modules/other/gail/gailbooleancell.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_BOOLEAN_CELL (gail_boolean_cell_get_type ()) #define GAIL_BOOLEAN_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BOOLEAN_CELL, GailBooleanCell)) @@ -52,9 +50,6 @@ struct _GailBooleanCellClass AtkObject *gail_boolean_cell_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_BOOLEAN_CELL_H__ */ diff --git a/modules/other/gail/gailbox.h b/modules/other/gail/gailbox.h index 64a90dd65e..dd92ea7bcc 100644 --- a/modules/other/gail/gailbox.h +++ b/modules/other/gail/gailbox.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_BOX (gail_box_get_type ()) #define GAIL_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BOX, GailBox)) @@ -49,9 +47,6 @@ struct _GailBoxClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_BOX_H__ */ diff --git a/modules/other/gail/gailbutton.h b/modules/other/gail/gailbutton.h index 7f3c30a76a..3ce770d47a 100644 --- a/modules/other/gail/gailbutton.h +++ b/modules/other/gail/gailbutton.h @@ -24,10 +24,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_BUTTON (gail_button_get_type ()) #define GAIL_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_BUTTON, GailButton)) @@ -67,9 +64,6 @@ struct _GailButtonClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_BUTTON_H__ */ diff --git a/modules/other/gail/gailcalendar.h b/modules/other/gail/gailcalendar.h index ef6290b7c8..352098c6c0 100644 --- a/modules/other/gail/gailcalendar.h +++ b/modules/other/gail/gailcalendar.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CALENDAR (gail_calendar_get_type ()) #define GAIL_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CALENDAR, GailCalendar)) @@ -49,9 +47,6 @@ struct _GailCalendarClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CALENDAR_H__ */ diff --git a/modules/other/gail/gailcell.h b/modules/other/gail/gailcell.h index 9e3bae55d9..1ab0f41241 100644 --- a/modules/other/gail/gailcell.h +++ b/modules/other/gail/gailcell.h @@ -22,10 +22,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CELL (gail_cell_get_type ()) #define GAIL_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CELL, GailCell)) @@ -70,7 +67,6 @@ struct _ActionInfo { ACTION_FUNC do_action_func; }; - void gail_cell_initialise (GailCell *cell, GtkWidget *widget, AtkObject *parent, @@ -99,12 +95,6 @@ gboolean gail_cell_remove_action (GailCell *cell, gboolean gail_cell_remove_action_by_name (GailCell *cell, const gchar *action_name); - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CELL_H__ */ diff --git a/modules/other/gail/gailcellparent.h b/modules/other/gail/gailcellparent.h index 3932093ccb..1e2a43b403 100644 --- a/modules/other/gail/gailcellparent.h +++ b/modules/other/gail/gailcellparent.h @@ -25,9 +25,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS /* * The GailCellParent interface should be supported by any object which @@ -82,7 +80,6 @@ void gail_cell_parent_get_cell_area (GailCellParent *parent, gboolean gail_cell_parent_grab_focus (GailCellParent *parent, GailCell *cell); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS + #endif /* __GAIL_CELL_PARENT_H__ */ diff --git a/modules/other/gail/gailcheckmenuitem.h b/modules/other/gail/gailcheckmenuitem.h index 292cdd9aae..5821ce77c2 100644 --- a/modules/other/gail/gailcheckmenuitem.h +++ b/modules/other/gail/gailcheckmenuitem.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CHECK_MENU_ITEM (gail_check_menu_item_get_type ()) #define GAIL_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CHECK_MENU_ITEM, GailCheckMenuItem)) @@ -51,9 +49,6 @@ struct _GailCheckMenuItemClass AtkObject* gail_check_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CHECK_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailchecksubmenuitem.h b/modules/other/gail/gailchecksubmenuitem.h index 174cdbafe3..f46e66ff10 100644 --- a/modules/other/gail/gailchecksubmenuitem.h +++ b/modules/other/gail/gailchecksubmenuitem.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CHECK_SUB_MENU_ITEM (gail_check_sub_menu_item_get_type ()) #define GAIL_CHECK_SUB_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CHECK_SUB_MENU_ITEM, GailCheckSubMenuItem)) @@ -51,9 +49,6 @@ struct _GailCheckSubMenuItemClass AtkObject* gail_check_sub_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CHECK_SUB_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailclist.h b/modules/other/gail/gailclist.h index d7b65a3e1b..f51104ea22 100644 --- a/modules/other/gail/gailclist.h +++ b/modules/other/gail/gailclist.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CLIST (gail_clist_get_type ()) #define GAIL_CLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CLIST, GailCList)) @@ -62,9 +60,6 @@ struct _GailCListClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CLIST_H__ */ diff --git a/modules/other/gail/gailclistcell.h b/modules/other/gail/gailclistcell.h index 0cd208ce29..fca0620706 100644 --- a/modules/other/gail/gailclistcell.h +++ b/modules/other/gail/gailclistcell.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CLIST_CELL (gail_clist_cell_get_type ()) #define GAIL_CLIST_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CLIST_CELL, GailCListCell)) @@ -51,9 +49,6 @@ struct _GailCListCellClass AtkObject *gail_clist_cell_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CLIST_CELL_H__ */ diff --git a/modules/other/gail/gailcombo.h b/modules/other/gail/gailcombo.h index 6d99e73638..3acc74b07b 100644 --- a/modules/other/gail/gailcombo.h +++ b/modules/other/gail/gailcombo.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_COMBO (gail_combo_get_type ()) #define GAIL_COMBO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_COMBO, GailCombo)) @@ -57,9 +54,6 @@ struct _GailComboClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_COMBO_H__ */ diff --git a/modules/other/gail/gailcombobox.h b/modules/other/gail/gailcombobox.h index 8de7d5589d..b342715900 100644 --- a/modules/other/gail/gailcombobox.h +++ b/modules/other/gail/gailcombobox.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_COMBO_BOX (gail_combo_box_get_type ()) #define GAIL_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_COMBO_BOX, GailComboBox)) @@ -58,9 +55,6 @@ struct _GailComboBoxClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_COMBO_BOX_H__ */ diff --git a/modules/other/gail/gailcontainer.h b/modules/other/gail/gailcontainer.h index fab2e5573b..3ad738193d 100644 --- a/modules/other/gail/gailcontainer.h +++ b/modules/other/gail/gailcontainer.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CONTAINER (gail_container_get_type ()) #define GAIL_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CONTAINER, GailContainer)) @@ -62,9 +59,6 @@ struct _GailContainerClass gpointer data); }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_CONTAINER_H__ */ diff --git a/modules/other/gail/gailcontainercell.h b/modules/other/gail/gailcontainercell.h index 022b78bb63..739a334504 100644 --- a/modules/other/gail/gailcontainercell.h +++ b/modules/other/gail/gailcontainercell.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_CONTAINER_CELL (gail_container_cell_get_type ()) #define GAIL_CONTAINER_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CONTAINER_CELL, GailContainerCell)) @@ -62,10 +60,6 @@ void gail_container_cell_remove_child (GailContainerCell *container, GailCell *child); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */ diff --git a/modules/other/gail/gailentry.h b/modules/other/gail/gailentry.h index aeed8456fd..150025e50b 100644 --- a/modules/other/gail/gailentry.h +++ b/modules/other/gail/gailentry.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_ENTRY (gail_entry_get_type ()) #define GAIL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ENTRY, GailEntry)) @@ -68,9 +66,6 @@ struct _GailEntryClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_ENTRY_H__ */ diff --git a/modules/other/gail/gailexpander.h b/modules/other/gail/gailexpander.h index 94644c551e..721a115a21 100644 --- a/modules/other/gail/gailexpander.h +++ b/modules/other/gail/gailexpander.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_EXPANDER (gail_expander_get_type ()) #define GAIL_EXPANDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_EXPANDER, GailExpander)) @@ -56,9 +54,6 @@ struct _GailExpanderClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_EXPANDER_H__ */ diff --git a/modules/other/gail/gailframe.h b/modules/other/gail/gailframe.h index 4977ea04ba..49f2b55d0f 100644 --- a/modules/other/gail/gailframe.h +++ b/modules/other/gail/gailframe.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_FRAME (gail_frame_get_type ()) #define GAIL_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_FRAME, GailFrame)) @@ -50,9 +47,6 @@ struct _GailFrameClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_FRAME_H__ */ diff --git a/modules/other/gail/gailhtmlbox.h b/modules/other/gail/gailhtmlbox.h index c03215be78..eef67f4026 100644 --- a/modules/other/gail/gailhtmlbox.h +++ b/modules/other/gail/gailhtmlbox.h @@ -22,9 +22,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_HTML_BOX (gail_html_box_get_type ()) #define GAIL_HTML_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_HTML_BOX, GailHtmlBox)) @@ -48,9 +46,6 @@ struct _GailHtmlBoxClass GType gail_html_box_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_HTML_BOX_H__ */ diff --git a/modules/other/gail/gailimage.h b/modules/other/gail/gailimage.h index 6221fc0416..9feadd44f7 100644 --- a/modules/other/gail/gailimage.h +++ b/modules/other/gail/gailimage.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_IMAGE (gail_image_get_type ()) #define GAIL_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_IMAGE, GailImage)) @@ -52,9 +50,6 @@ struct _GailImageClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_IMAGE_H__ */ diff --git a/modules/other/gail/gailimagecell.h b/modules/other/gail/gailimagecell.h index 7dfd65c547..d6f3ebc2cd 100644 --- a/modules/other/gail/gailimagecell.h +++ b/modules/other/gail/gailimagecell.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_IMAGE_CELL (gail_image_cell_get_type ()) #define GAIL_IMAGE_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_IMAGE_CELL, GailImageCell)) @@ -54,9 +52,6 @@ struct _GailImageCellClass AtkObject *gail_image_cell_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_IMAGE_CELL_H__ */ diff --git a/modules/other/gail/gailitem.h b/modules/other/gail/gailitem.h index 447ea38cbd..08b0eb647e 100644 --- a/modules/other/gail/gailitem.h +++ b/modules/other/gail/gailitem.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_ITEM (gail_item_get_type ()) #define GAIL_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_ITEM, GailItem)) @@ -54,9 +52,6 @@ struct _GailItemClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_ITEM_H__ */ diff --git a/modules/other/gail/gaillabel.h b/modules/other/gail/gaillabel.h index c3acf06ffa..24e2af7f7f 100644 --- a/modules/other/gail/gaillabel.h +++ b/modules/other/gail/gaillabel.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_LABEL (gail_label_get_type ()) #define GAIL_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_LABEL, GailLabel)) @@ -57,9 +55,6 @@ struct _GailLabelClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_LABEL_H__ */ diff --git a/modules/other/gail/gaillist.h b/modules/other/gail/gaillist.h index e937a10fa5..d2e2ce5bdb 100644 --- a/modules/other/gail/gaillist.h +++ b/modules/other/gail/gaillist.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_LIST (gail_list_get_type ()) #define GAIL_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_LIST, GailList)) @@ -49,9 +47,6 @@ struct _GailListClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_LIST_H__ */ diff --git a/modules/other/gail/gailmenu.h b/modules/other/gail/gailmenu.h index 3ce04157f9..f25aae5422 100644 --- a/modules/other/gail/gailmenu.h +++ b/modules/other/gail/gailmenu.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_MENU (gail_menu_get_type ()) #define GAIL_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_SHELL, GailMenu)) @@ -50,9 +47,6 @@ struct _GailMenuClass GailMenuShellClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_MENU_H__ */ diff --git a/modules/other/gail/gailmenuitem.h b/modules/other/gail/gailmenuitem.h index a7e0f64726..fd011bebac 100644 --- a/modules/other/gail/gailmenuitem.h +++ b/modules/other/gail/gailmenuitem.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_MENU_ITEM (gail_menu_item_get_type ()) #define GAIL_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_ITEM, GailMenuItem)) @@ -56,9 +53,6 @@ struct _GailMenuItemClass AtkObject* gail_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailmenushell.h b/modules/other/gail/gailmenushell.h index 0c099a051f..17b32c6c0e 100644 --- a/modules/other/gail/gailmenushell.h +++ b/modules/other/gail/gailmenushell.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_MENU_SHELL (gail_menu_shell_get_type ()) #define GAIL_MENU_SHELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_MENU_SHELL, GailMenuShell)) @@ -50,9 +47,6 @@ struct _GailMenuShellClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_MENU_SHELL_H__ */ diff --git a/modules/other/gail/gailnotebook.h b/modules/other/gail/gailnotebook.h index f2226b5cf7..db6ebe276c 100644 --- a/modules/other/gail/gailnotebook.h +++ b/modules/other/gail/gailnotebook.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_NOTEBOOK (gail_notebook_get_type ()) #define GAIL_NOTEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_NOTEBOOK, GailNotebook)) @@ -63,9 +61,6 @@ struct _GailNotebookClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_NOTEBOOK_H__ */ diff --git a/modules/other/gail/gailnotebookpage.h b/modules/other/gail/gailnotebookpage.h index 022f4affc7..9210c65e05 100644 --- a/modules/other/gail/gailnotebookpage.h +++ b/modules/other/gail/gailnotebookpage.h @@ -25,9 +25,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_NOTEBOOK_PAGE (gail_notebook_page_get_type ()) #define GAIL_NOTEBOOK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),GAIL_TYPE_NOTEBOOK_PAGE, GailNotebookPage)) @@ -61,10 +59,6 @@ struct _GailNotebookPageClass AtkObject *gail_notebook_page_new(GtkNotebook *notebook, gint pagenum); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_NOTEBOOK_PAGE_H__ */ - diff --git a/modules/other/gail/gailobject.h b/modules/other/gail/gailobject.h index fc981a9c08..4aff2eeed0 100644 --- a/modules/other/gail/gailobject.h +++ b/modules/other/gail/gailobject.h @@ -22,9 +22,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_OBJECT (gail_object_get_type ()) #define GAIL_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_OBJECT, GailObject) @@ -48,9 +46,6 @@ struct _GailObjectClass AtkGObjectAccessibleClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_OBJECT_H__ */ diff --git a/modules/other/gail/gailoptionmenu.h b/modules/other/gail/gailoptionmenu.h index 0e7bd186e2..608ec26af3 100644 --- a/modules/other/gail/gailoptionmenu.h +++ b/modules/other/gail/gailoptionmenu.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_OPTION_MENU (gail_option_menu_get_type ()) #define GAIL_OPTION_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_OPTION_MENU, GailOptionMenu)) @@ -50,9 +47,6 @@ struct _GailOptionMenuClass GailButtonClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_OPTION_MENU_H__ */ diff --git a/modules/other/gail/gailpaned.h b/modules/other/gail/gailpaned.h index bcf90c725f..250e890dcd 100644 --- a/modules/other/gail/gailpaned.h +++ b/modules/other/gail/gailpaned.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_PANED (gail_paned_get_type ()) #define GAIL_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PANED, GailPaned)) @@ -49,9 +47,6 @@ struct _GailPanedClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_PANED_H__ */ diff --git a/modules/other/gail/gailpixmap.h b/modules/other/gail/gailpixmap.h index e77d1081f9..8a4df448dd 100644 --- a/modules/other/gail/gailpixmap.h +++ b/modules/other/gail/gailpixmap.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_PIXMAP (gail_pixmap_get_type ()) #define GAIL_PIXMAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PIXMAP, GailPixmap)) @@ -52,9 +50,6 @@ struct _GailPixmapClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_PIXMAP_H__ */ diff --git a/modules/other/gail/gailprogressbar.h b/modules/other/gail/gailprogressbar.h index 2f0e024139..27b578a1f2 100644 --- a/modules/other/gail/gailprogressbar.h +++ b/modules/other/gail/gailprogressbar.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_PROGRESS_BAR (gail_progress_bar_get_type ()) #define GAIL_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_PROGRESS_BAR, GailProgressBar)) @@ -52,9 +49,6 @@ struct _GailProgressBarClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_PROGRESS_BAR_H__ */ diff --git a/modules/other/gail/gailradiobutton.h b/modules/other/gail/gailradiobutton.h index 92089a96bf..938c2830b5 100644 --- a/modules/other/gail/gailradiobutton.h +++ b/modules/other/gail/gailradiobutton.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_RADIO_BUTTON (gail_radio_button_get_type ()) #define GAIL_RADIO_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_BUTTON, GailRadioButton)) @@ -51,9 +49,6 @@ struct _GailRadioButtonClass GailToggleButtonClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_RADIO_BUTTON_H__ */ diff --git a/modules/other/gail/gailradiomenuitem.h b/modules/other/gail/gailradiomenuitem.h index b8f6847bdb..332d81f82d 100644 --- a/modules/other/gail/gailradiomenuitem.h +++ b/modules/other/gail/gailradiomenuitem.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_RADIO_MENU_ITEM (gail_radio_menu_item_get_type ()) #define GAIL_RADIO_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_MENU_ITEM, GailRadioMenuItem)) @@ -53,9 +51,6 @@ struct _GailRadioMenuItemClass AtkObject* gail_radio_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_RADIO_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailradiosubmenuitem.h b/modules/other/gail/gailradiosubmenuitem.h index 10e2e7eb70..5bcf168b40 100644 --- a/modules/other/gail/gailradiosubmenuitem.h +++ b/modules/other/gail/gailradiosubmenuitem.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_RADIO_SUB_MENU_ITEM (gail_radio_sub_menu_item_get_type ()) #define GAIL_RADIO_SUB_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RADIO_SUB_MENU_ITEM, GailRadioSubMenuItem)) @@ -53,9 +51,6 @@ struct _GailRadioSubMenuItemClass AtkObject* gail_radio_sub_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_RADIO_SUB_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailrange.h b/modules/other/gail/gailrange.h index c394c3382b..5e6bc0de17 100644 --- a/modules/other/gail/gailrange.h +++ b/modules/other/gail/gailrange.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_RANGE (gail_range_get_type ()) #define GAIL_RANGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RANGE, GailRange)) @@ -56,9 +53,6 @@ struct _GailRangeClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_RANGE_H__ */ diff --git a/modules/other/gail/gailrenderercell.h b/modules/other/gail/gailrenderercell.h index f380647f20..6146418685 100644 --- a/modules/other/gail/gailrenderercell.h +++ b/modules/other/gail/gailrenderercell.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_RENDERER_CELL (gail_renderer_cell_get_type ()) #define GAIL_RENDERER_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_RENDERER_CELL, GailRendererCell)) @@ -57,9 +55,6 @@ gail_renderer_cell_update_cache (GailRendererCell *cell, gboolean emit_change_si AtkObject *gail_renderer_cell_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */ diff --git a/modules/other/gail/gailscale.h b/modules/other/gail/gailscale.h index 9e0687a0a6..b670a42bfc 100644 --- a/modules/other/gail/gailscale.h +++ b/modules/other/gail/gailscale.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SCALE (gail_scale_get_type ()) #define GAIL_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCALE, GailScale)) @@ -52,9 +50,6 @@ struct _GailScaleClass GailRangeClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SCALE_H__ */ diff --git a/modules/other/gail/gailscrollbar.h b/modules/other/gail/gailscrollbar.h index 624aedef1c..37830e62eb 100644 --- a/modules/other/gail/gailscrollbar.h +++ b/modules/other/gail/gailscrollbar.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SCROLLBAR (gail_scrollbar_get_type ()) #define GAIL_SCROLLBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCROLLBAR, GailScrollbar)) @@ -50,9 +47,6 @@ struct _GailScrollbarClass GailRangeClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SCROLLBAR_H__ */ diff --git a/modules/other/gail/gailscrolledwindow.h b/modules/other/gail/gailscrolledwindow.h index b8564780f3..5d8b7c078c 100644 --- a/modules/other/gail/gailscrolledwindow.h +++ b/modules/other/gail/gailscrolledwindow.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SCROLLED_WINDOW (gail_scrolled_window_get_type ()) #define GAIL_SCROLLED_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SCROLLED_WINDOW, GailScrolledWindow)) @@ -49,9 +47,6 @@ struct _GailScrolledWindowClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SCROLLED_WINDOW_H__ */ diff --git a/modules/other/gail/gailseparator.h b/modules/other/gail/gailseparator.h index 94420edcd6..46a7882546 100644 --- a/modules/other/gail/gailseparator.h +++ b/modules/other/gail/gailseparator.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SEPARATOR (gail_separator_get_type ()) #define GAIL_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SEPARATOR, GailSeparator)) @@ -49,9 +47,6 @@ struct _GailSeparatorClass GailWidgetClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SEPARATOR_H__ */ diff --git a/modules/other/gail/gailspinbutton.h b/modules/other/gail/gailspinbutton.h index 140ac94dcd..3dac8d18e6 100644 --- a/modules/other/gail/gailspinbutton.h +++ b/modules/other/gail/gailspinbutton.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SPIN_BUTTON (gail_spin_button_get_type ()) #define GAIL_SPIN_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SPIN_BUTTON, GailSpinButton)) @@ -51,9 +49,6 @@ struct _GailSpinButtonClass GailEntryClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SPIN_BUTTON_H__ */ diff --git a/modules/other/gail/gailstatusbar.h b/modules/other/gail/gailstatusbar.h index 52efc25bf8..6078731369 100644 --- a/modules/other/gail/gailstatusbar.h +++ b/modules/other/gail/gailstatusbar.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_STATUSBAR (gail_statusbar_get_type ()) #define GAIL_STATUSBAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_STATUSBAR, GailStatusbar)) @@ -52,9 +50,6 @@ struct _GailStatusbarClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_STATUSBAR_H__ */ diff --git a/modules/other/gail/gailsubmenuitem.h b/modules/other/gail/gailsubmenuitem.h index 91334c587e..963839e79f 100644 --- a/modules/other/gail/gailsubmenuitem.h +++ b/modules/other/gail/gailsubmenuitem.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_SUB_MENU_ITEM (gail_sub_menu_item_get_type ()) #define GAIL_SUB_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_SUB_MENU_ITEM, GailSubMenuItem)) @@ -52,9 +50,6 @@ struct _GailSubMenuItemClass AtkObject* gail_sub_menu_item_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_SUB_MENU_ITEM_H__ */ diff --git a/modules/other/gail/gailtextcell.h b/modules/other/gail/gailtextcell.h index 76c1ade872..c158882748 100644 --- a/modules/other/gail/gailtextcell.h +++ b/modules/other/gail/gailtextcell.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_TEXT_CELL (gail_text_cell_get_type ()) #define GAIL_TEXT_CELL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_CELL, GailTextCell)) @@ -56,9 +54,6 @@ struct _GailTextCellClass AtkObject *gail_text_cell_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_TEXT_CELL_H__ */ diff --git a/modules/other/gail/gailtextview.h b/modules/other/gail/gailtextview.h index 4dfd48e9ea..273694dff0 100644 --- a/modules/other/gail/gailtextview.h +++ b/modules/other/gail/gailtextview.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_TEXT_VIEW (gail_text_view_get_type ()) #define GAIL_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TEXT_VIEW, GailTextView)) @@ -62,9 +60,6 @@ struct _GailTextViewClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TEXT_VIEW_H__ */ diff --git a/modules/other/gail/gailtogglebutton.h b/modules/other/gail/gailtogglebutton.h index b390d8356d..aa93210bd0 100644 --- a/modules/other/gail/gailtogglebutton.h +++ b/modules/other/gail/gailtogglebutton.h @@ -23,9 +23,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_TOGGLE_BUTTON (gail_toggle_button_get_type ()) #define GAIL_TOGGLE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TOGGLE_BUTTON, GailToggleButton)) @@ -49,9 +47,6 @@ struct _GailToggleButtonClass GailButtonClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TOGGLE_BUTTON_H__ */ diff --git a/modules/other/gail/gailtoplevel.h b/modules/other/gail/gailtoplevel.h index 82ee7f58a8..d5ca8d5198 100644 --- a/modules/other/gail/gailtoplevel.h +++ b/modules/other/gail/gailtoplevel.h @@ -22,9 +22,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_TOPLEVEL (gail_toplevel_get_type ()) #define GAIL_TOPLEVEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TOPLEVEL, GailToplevel)) @@ -49,8 +47,6 @@ struct _GailToplevelClass AtkObjectClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __GAIL_TOPLEVEL_H__ */ diff --git a/modules/other/gail/gailtreeview.h b/modules/other/gail/gailtreeview.h index fd8a43fd11..aeebfadaa8 100644 --- a/modules/other/gail/gailtreeview.h +++ b/modules/other/gail/gailtreeview.h @@ -24,9 +24,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_TREE_VIEW (gail_tree_view_get_type ()) #define GAIL_TREE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_TREE_VIEW, GailTreeView)) @@ -68,9 +66,6 @@ struct _GailTreeViewClass AtkObject* gail_tree_view_ref_focus_cell (GtkTreeView *treeview); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_TREE_VIEW_H__ */ diff --git a/modules/other/gail/gailutil.h b/modules/other/gail/gailutil.h index 4b968a62ca..acc44d10b5 100644 --- a/modules/other/gail/gailutil.h +++ b/modules/other/gail/gailutil.h @@ -22,9 +22,7 @@ #include -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_UTIL (gail_util_get_type ()) #define GAIL_UTIL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_UTIL, GailUtil)) @@ -71,10 +69,6 @@ struct _GailMiscClass AtkMiscClass parent_class; }; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_UTIL_H__ */ diff --git a/modules/other/gail/gailwidget.h b/modules/other/gail/gailwidget.h index 04fdae0509..bf046872f6 100644 --- a/modules/other/gail/gailwidget.h +++ b/modules/other/gail/gailwidget.h @@ -22,10 +22,7 @@ #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_WIDGET (gail_widget_get_type ()) #define GAIL_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_WIDGET, GailWidget)) @@ -63,9 +60,6 @@ struct _GailWidgetClass AtkObject* gail_widget_new (GtkWidget *widget); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_WIDGET_H__ */ diff --git a/modules/other/gail/gailwindow.h b/modules/other/gail/gailwindow.h index 0b195072e6..923554add2 100644 --- a/modules/other/gail/gailwindow.h +++ b/modules/other/gail/gailwindow.h @@ -23,10 +23,7 @@ #include #include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GAIL_TYPE_WINDOW (gail_window_get_type ()) #define GAIL_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_WINDOW, GailWindow)) @@ -53,9 +50,6 @@ struct _GailWindowClass GailContainerClass parent_class; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GAIL_WINDOW_H__ */ -- 2.30.2